merge
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 18:06:14 +0000 (19:06 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 3 Jan 2006 18:06:14 +0000 (19:06 +0100)

Trivial merge